electron-incremental-update 2.3.0 → 2.3.2

package/dist/vite.d.ts

@@ -295,7 +295,7 @@ 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 = NonNullable<NonNullable<ElectronSimpleOptions['preload']>['onstart']>;
+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

@@ -166,7 +166,7 @@ function parseSubjects(subject) {
 }
 
 // src/vite/option.ts
-function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
+function parseOptions(pkg, defaultExternal, sourcemap = false, minify = false, options = {}) {
   const {
     minimumVersion = "0.0.0",
     entry: {
@@ -222,11 +222,8 @@ function parseOptions(pkg, sourcemap = false, minify = false, options = {}) {
     overrideViteOptions,
     ignoreDynamicRequires,
     external: (source, importer, isResolved) => {
-      if (source.endsWith(".node")) {
-        return false;
-      }
       if (!external) {
-        return void 0;
+        return defaultExternal(source);
       }
       if (typeof external === "string") {
         return source === external;
@@ -321,13 +318,16 @@ async function electronWithUpdater(options) {
     );
     bytecodeOptions = void 0;
   }
+  const defaultExternal = (src) => {
+    return src.startsWith("node:") || Object.keys("dependencies" in pkg ? pkg.dependencies : {}).includes(src) || src === "original-fs";
+  };
   const {
     buildAsarOption,
     buildEntryOption,
     buildVersionOption,
     postBuild,
     cert
-  } = parseOptions(pkg, sourcemap, minify, updater);
+  } = parseOptions(pkg, defaultExternal, sourcemap, minify, updater);
   const { entryOutputDirPath, nativeModuleEntryMap, appEntryPath } = buildEntryOption;
   try {
     fs2.rmSync(buildAsarOption.electronDistPath, { recursive: true, force: true });
@@ -358,9 +358,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);
       },
@@ -387,7 +385,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: defaultExternal,
     treeshake: true
   };
   const esmShimPlugin = isESM ? import('./esm-4S4XCVEW.js').then((m) => m.esm()) : void 0;
@@ -398,7 +396,6 @@ async function electronWithUpdater(options) {
         if (!isInit) {
           isInit = true;
           await _buildEntry();
-          await _postBuild();
         }
         if (_main.onstart) {
           _main.onstart(args);
@@ -440,7 +437,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 });
@@ -489,11 +485,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();
+            }
+          }
         );
       }
     };

package/package.json

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