electron-incremental-update 2.4.1 → 2.4.2

package/dist/vite.d.ts

@@ -1,7 +1,7 @@
 import { Promisable, AnyFunction } from '@subframe7536/type-utils';
-import { InlineConfig, PluginOption } from 'vite';
-import { ElectronSimpleOptions } from 'vite-plugin-electron/simple.js';
-import { ElectronSimpleOptions as ElectronSimpleOptions$1 } from 'vite-plugin-electron/simple';
+import { InlineConfig, PluginOption, UserConfig, UserConfigFn } from 'vite';
+import { ElectronOptions } from 'vite-plugin-electron';
+import { ElectronSimpleOptions } from 'vite-plugin-electron/simple';
 export { isCI } from 'ci-info';
 export { getPackageInfo, getPackageInfoSync, loadPackageJSON, resolveModule } from 'local-pkg';
 
@@ -81,15 +81,11 @@ interface PKG {
     main: string;
     type: 'commonjs' | 'module';
 }
-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 ExcludeOutputDirOptions = {
-    vite?: {
+interface ViteOverride {
+    /**
+     * Override vite options
+     */
+    vite?: ElectronOptions['vite'] & {
         build?: {
             outDir: never;
             rollupOptions?: {
@@ -99,7 +95,7 @@ type ExcludeOutputDirOptions = {
             };
         };
     };
-};
+}
 interface ElectronWithUpdaterOptions {
     /**
      * Whether is in build mode
@@ -151,13 +147,34 @@ interface ElectronWithUpdaterOptions {
      *
      * To change output directories, use `options.updater.paths.electronDistPath` instead
      */
-    main: MakeRequiredAndReplaceKey<ElectronSimpleOptions['main'], 'entry', 'files'> & ExcludeOutputDirOptions;
+    main: {
+        /**
+         * Shortcut of `build.rollupOptions.input`
+         */
+        files: NonNullable<ElectronOptions['entry']>;
+        /**
+         * Electron App startup function.
+         *
+         * It will mount the Electron App child-process to `process.electronApp`.
+         * @param argv default value `['.', '--no-sandbox']`
+         * @param options options for `child_process.spawn`
+         * @param customElectronPkg custom electron package name (default: 'electron')
+         */
+        onstart?: ElectronOptions['onstart'];
+    } & ViteOverride;
     /**
      * Preload process options
      *
      * To change output directories, use `options.updater.paths.electronDistPath` instead
      */
-    preload: MakeRequiredAndReplaceKey<Exclude<ElectronSimpleOptions['preload'], undefined>, 'input', 'files'> & ExcludeOutputDirOptions;
+    preload: {
+        /**
+         * Shortcut of `build.rollupOptions.input`.
+         *
+         * Preload scripts may contain Web assets, so use the `build.rollupOptions.input` instead `build.lib.entry`.
+         */
+        files: NonNullable<ElectronOptions['entry']>;
+    } & ViteOverride;
     /**
      * Updater options
      */
@@ -379,7 +396,7 @@ interface UpdaterOptions {
     overrideGenerator?: GeneratorOverrideFunctions;
 }
 
-type StartupFn = NonNullable<NonNullable<ElectronSimpleOptions$1['main']>['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}
@@ -473,4 +490,44 @@ declare function fixWinCharEncoding<T extends AnyFunction>(fn: T): T;
  */
 declare function electronWithUpdater(options: ElectronWithUpdaterOptions): Promise<PluginOption[] | undefined>;
 
-export { type ElectronWithUpdaterOptions, convertLiteral, debugStartup, electronWithUpdater as default, electronWithUpdater, filterErrorMessageStartup, fixWinCharEncoding };
+type MakeOptional<T, K extends keyof T> = Partial<Pick<T, K>> & Omit<T, K>;
+interface ElectronViteHelperOptions extends MakeOptional<ElectronWithUpdaterOptions, 'isBuild'> {
+    /**
+     * Config for renderer process
+     */
+    renderer?: UserConfig;
+}
+/**
+ * Vite config helper
+ * @see {@link electronWithUpdater}
+ * @example
+ * ```ts
+ * import { defineElectronConfig } from 'electron-incremental-update/vite'
+ *
+ * export default defineElectronConfig({
+ *   main: {
+ *     files: ['./electron/main/index.ts', './electron/main/worker.ts'],
+ *     // see https://github.com/electron-vite/electron-vite-vue/blob/85ed267c4851bf59f32888d766c0071661d4b94c/vite.config.ts#L22-L28
+ *     onstart: debugStartup,
+ *   },
+ *   preload: {
+ *     files: './electron/preload/index.ts',
+ *   },
+ *   updater: {
+ *     // options
+ *   },
+ *   renderer: {
+ *     server: process.env.VSCODE_DEBUG && (() => {
+ *       const url = new URL(pkg.debug.env.VITE_DEV_SERVER_URL)
+ *       return {
+ *         host: url.hostname,
+ *         port: +url.port,
+ *       }
+ *     })(),
+ *   }
+ * })
+ * ```
+ */
+declare function defineElectronConfig(options: ElectronViteHelperOptions): UserConfigFn;
+
+export { type ElectronViteHelperOptions, type ElectronWithUpdaterOptions, convertLiteral, debugStartup, electronWithUpdater as default, defineElectronConfig, electronWithUpdater, filterErrorMessageStartup, fixWinCharEncoding };

package/dist/vite.js

@@ -854,7 +854,6 @@ async function electronWithUpdater(options) {
     },
     preload: {
       input: _preload.files,
-      onstart: _preload.onstart,
       vite: mergeConfig(
         {
           plugins: [
@@ -931,4 +930,16 @@ async function electronWithUpdater(options) {
   return result;
 }
 
-export { convertLiteral, debugStartup, electronWithUpdater as default, electronWithUpdater, filterErrorMessageStartup, fixWinCharEncoding };
+// src/vite/define.ts
+function defineElectronConfig(options) {
+  return ({ command }) => {
+    options.isBuild ??= command === "build";
+    const electronPlugin = electronWithUpdater(options);
+    const result = options.renderer ?? {};
+    result.plugins ??= [];
+    result.plugins.push(electronPlugin);
+    return result;
+  };
+}
+
+export { convertLiteral, debugStartup, electronWithUpdater as default, defineElectronConfig, electronWithUpdater, filterErrorMessageStartup, fixWinCharEncoding };

package/package.json

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