electron-incremental-update 2.3.1 → 2.3.3

package/README.md

@@ -920,9 +920,9 @@ export interface BuildEntryOption {
    */
   ignoreDynamicRequires?: boolean
   /**
-   * `external` option in `build.rollupOptions`, external `.node` by default
+   * `external` option in `build.rollupOptions`, default is node built-in modules or native modules
    */
-  external?: string | string[] | ((source: string, importer: string | undefined, isResolved: boolean) => boolean | null | undefined | void)
+  external?: NonNullable<NonNullable<InlineConfig['build']>['rollupOptions']>['external']
   /**
    * Custom options for `vite` build
    * ```ts

package/dist/vite.d.ts

@@ -1,4 +1,4 @@
-import { Promisable } from '@subframe7536/type-utils';
+import { Promisable, AnyFunction } from '@subframe7536/type-utils';
 import { InlineConfig, PluginOption } from 'vite';
 import { ElectronSimpleOptions } from 'vite-plugin-electron/simple';
 export { isCI } from 'ci-info';
@@ -104,9 +104,9 @@ interface BuildEntryOption {
      */
     ignoreDynamicRequires?: boolean;
     /**
-     * `external` option in `build.rollupOptions`, external `.node` by default
+     * `external` option in `build.rollupOptions`, default is node built-in modules or native modules
      */
-    external?: string | string[] | ((source: string, importer: string | undefined, isResolved: boolean) => boolean | null | undefined | void);
+    external?: NonNullable<NonNullable<InlineConfig['build']>['rollupOptions']>['external'];
     /**
      * Custom options for `vite` build
      * ```ts
@@ -297,7 +297,8 @@ type ReplaceKey<T, Key extends keyof T, NewKey extends string> = Omit<T, Key> &
 type MakeRequiredAndReplaceKey<T, K extends keyof T, NewKey extends string> = MakeRequired<ReplaceKey<T, K, NewKey>, NewKey>;
 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})
+ * Startup function for debug
+ * @see {@link https://github.com/electron-vite/electron-vite-vue/blob/main/vite.config.ts electron-vite-vue template}
  * @example
  * import { debugStartup, buildElectronPluginOptions } from 'electron-incremental-update/vite'
  * const options = buildElectronPluginOptions({
@@ -309,6 +310,24 @@ type StartupFn = NonNullable<NonNullable<ElectronSimpleOptions['main']>['onstart
  * })
  */
 declare const debugStartup: StartupFn;
+/**
+ * Startup function to filter unwanted error message
+ * @see {@link https://github.com/electron/electron/issues/46903#issuecomment-2848483520 reference}
+ * @example
+ * import { filterErrorMessageStartup, buildElectronPluginOptions } from 'electron-incremental-update/vite'
+ * const options = buildElectronPluginOptions({
+ *   // ...
+ *   main: {
+ *     // ...
+ *     startup: args => filterErrorMessageStartup(
+ *       args,
+ *       // ignore error message when function returns false
+ *       msg => !/"code":-32601/.test(message)
+ *     )
+ *   },
+ * })
+ */
+declare function filterErrorMessageStartup(args: Parameters<StartupFn>[0], filter: (msg: string) => boolean): Promise<void>;
 /**
  * Startup function util to fix Windows terminal charset
  * @example
@@ -321,7 +340,7 @@ declare const debugStartup: StartupFn;
  *   },
  * })
  */
-declare function fixWinCharEncoding(fn: StartupFn): StartupFn;
+declare function fixWinCharEncoding<T extends AnyFunction>(fn: T): T;
 type ExcludeOutputDirOptions = {
     vite?: {
         build?: {
@@ -454,4 +473,4 @@ interface ElectronWithUpdaterOptions {
  */
 declare function electronWithUpdater(options: ElectronWithUpdaterOptions): Promise<PluginOption[] | undefined>;
 
-export { type ElectronWithUpdaterOptions, convertLiteral, debugStartup, electronWithUpdater as default, electronWithUpdater, fixWinCharEncoding };
+export { type ElectronWithUpdaterOptions, convertLiteral, debugStartup, electronWithUpdater as default, electronWithUpdater, filterErrorMessageStartup, fixWinCharEncoding };

package/dist/vite.js

@@ -13,6 +13,7 @@ import { startup, build } from 'vite-plugin-electron';
 import { notBundle } from 'vite-plugin-electron/plugin';
 import ElectronSimple from 'vite-plugin-electron/simple';
 import Asar from '@electron/asar';
+import { builtinModules } from 'node:module';
 import crypto from 'node:crypto';
 import zlib from 'node:zlib';
 import { generate } from 'selfsigned';
@@ -177,7 +178,12 @@ function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
       nativeModuleEntryMap = {},
       postBuild,
       ignoreDynamicRequires = false,
-      external,
+      external = [
+        /^node:.*/,
+        /.*\.(node|dll|dylib|so)$/,
+        "original-fs",
+        ...builtinModules
+      ],
       overrideViteOptions = {}
     } = {},
     paths: {
@@ -221,21 +227,7 @@ function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
     nativeModuleEntryMap,
     overrideViteOptions,
     ignoreDynamicRequires,
-    external: (source, importer, isResolved) => {
-      if (source.endsWith(".node") || source.startsWith("node:")) {
-        return false;
-      }
-      if (!external) {
-        return void 0;
-      }
-      if (typeof external === "string") {
-        return source === external;
-      }
-      if (Array.isArray(external)) {
-        return external.includes(source);
-      }
-      return external(source, importer, isResolved);
-    }
+    external
   };
   const { privateKey, cert } = parseKeys({
     keyLength,
@@ -256,13 +248,23 @@ function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
   return { buildAsarOption, buildEntryOption, buildVersionOption, postBuild, cert };
 }
 var vite_default = electronWithUpdater;
-var debugStartup = (args) => {
+var debugStartup = async (args) => {
   if (process.env.VSCODE_DEBUG) {
     console.log("[startup] Electron App");
   } else {
-    args.startup();
+    await args.startup();
   }
 };
+async function filterErrorMessageStartup(args, filter) {
+  await args.startup(void 0, { stdio: ["inherit", "inherit", "pipe", "ipc"] });
+  const elec = process.electronApp;
+  elec.stderr.addListener("data", (data) => {
+    const message = data.toString();
+    if (filter(message)) {
+      console.error(message);
+    }
+  });
+}
 function fixWinCharEncoding(fn) {
   return async (...args) => {
     if (process.platform === "win32") {
@@ -294,9 +296,6 @@ 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,
@@ -331,7 +330,7 @@ async function electronWithUpdater(options) {
     postBuild,
     cert
   } = parseOptions(pkg, sourcemap, minify, updater);
-  const { entryOutputDirPath, nativeModuleEntryMap, appEntryPath } = buildEntryOption;
+  const { entryOutputDirPath, nativeModuleEntryMap, appEntryPath, external } = buildEntryOption;
   try {
     fs2.rmSync(buildAsarOption.electronDistPath, { recursive: true, force: true });
     fs2.rmSync(entryOutputDirPath, { recursive: true, force: true });
@@ -361,9 +360,7 @@ async function electronWithUpdater(options) {
       bytecodeOptions
     );
     log.info(`Build entry to '${entryOutputDirPath}'`, { timestamp: true });
-  }
-  async function _postBuild() {
-    return await postBuild?.({
+    await postBuild?.({
       getPathFromEntryOutputDir(...paths) {
         return path3.join(entryOutputDirPath, ...paths);
       },
@@ -390,7 +387,7 @@ async function electronWithUpdater(options) {
   }
   let isInit = false;
   const rollupOptions = {
-    external: (src) => src.startsWith("node:") || Object.keys("dependencies" in pkg ? pkg.dependencies : {}).includes(src) || src === "original-fs",
+    external,
     treeshake: true
   };
   const esmShimPlugin = isESM ? import('./esm-4S4XCVEW.js').then((m) => m.esm()) : void 0;
@@ -401,12 +398,11 @@ async function electronWithUpdater(options) {
         if (!isInit) {
           isInit = true;
           await _buildEntry();
-          await _postBuild();
         }
         if (_main.onstart) {
-          _main.onstart(args);
+          await _main.onstart(args);
         } else {
-          args.startup();
+          await args.startup();
         }
       },
       vite: mergeConfig(
@@ -443,7 +439,6 @@ async function electronWithUpdater(options) {
               },
               async closeBundle() {
                 await _buildEntry();
-                await _postBuild();
                 const buffer = await buildAsar(buildAsarOption);
                 if (!buildVersionJson && !isCI) {
                   log.warn("No `buildVersionJson` option setup, skip build version json. Only build in CI by default", { timestamp: true });
@@ -492,11 +487,27 @@ async function electronWithUpdater(options) {
       configureServer(server) {
         server.watcher.add(files).on(
           "change",
-          (p) => files.includes(p) && _buildEntry().then(async () => {
-            await startup.exit();
-            await _postBuild();
-            await startup();
-          })
+          async (p) => {
+            if (!files.includes(p)) {
+              return;
+            }
+            await _buildEntry();
+            if (_main.onstart) {
+              await _main.onstart({
+                startup,
+                reload: () => {
+                  if (process.electronApp) {
+                    (server.hot || server.ws).send({ type: "full-reload" });
+                    startup.send("electron-vite&type=hot-reload");
+                  } else {
+                    startup();
+                  }
+                }
+              });
+            } else {
+              await startup();
+            }
+          }
         );
       }
     };
@@ -504,4 +515,4 @@ async function electronWithUpdater(options) {
   return [ElectronSimple(electronPluginOptions), extraHmrPlugin];
 }
 
-export { debugStartup, vite_default as default, electronWithUpdater, fixWinCharEncoding };
+export { debugStartup, vite_default as default, electronWithUpdater, filterErrorMessageStartup, fixWinCharEncoding };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-incremental-update",
   "type": "module",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "description": "Electron incremental update tools with Vite plugin, support bytecode protection",
   "author": "subframe7536",
   "license": "MIT",