electronup 0.0.5 → 0.0.6

package/dist/client/index.d.ts

@@ -1,67 +1,73 @@
 import { Configuration } from 'electron-builder';
-import { UserConfig } from 'vite';
+import { UserConfig, PluginOption } from 'vite';
 import { Options } from 'tsup';
 
-type ViteConfig = Omit<UserConfig, 'publicDir'>
-
-interface TsupConfig {
-  external?: (string | RegExp)[];
-  noExternal?: (string | RegExp)[];
-}
-
-interface BuilderConfig extends Configuration { }
-
-interface ElectronupConfig {
-  viteConfig?: ViteConfig
-  tsupConfig?: TsupConfig
-  preloadTsup?: Options | Options[]
-  builderConfig: BuilderConfig
-
-  /** 
-   * 渲染进程入口目录
-   * @default 'render'
-   */
-  renderDir?: string
-
-  /** 
-   * 主进程入口目录
-   * @default 'main'
-   */
-  mainDir?: string
-
-  /** 
-  * 静态资源目录
-  * @default 'public'
-  */
-  publicDir?: string
-
-  /** 
-  * 动态库目录
-  * @default 'lib'
-  */
-  libDir?: string
-
-  /** 
-  * 资源构建输出目录
-  * @default 'dist'
-  */
-  resourceDir?: string
-
-  /** 
-   * electron-builder 输出目录
-   * @default 'out'
-   */
-  outDir?: string
-}
-
-interface ConfigEnv {
-  command: 'build' | 'serve'
-  root: string
-}
-
-type ElectronupConfigFn = (env: ConfigEnv) => ElectronupConfig | Promise<ElectronupConfig>
-type UserElectronupConfig = ElectronupConfig | ElectronupConfigFn
+type ViteConfig = Omit<UserConfig, 'plugins' | 'publicDir'> & {
+  plugins?: PluginOption[]
+}
 
-declare const defineConfig: (config: UserElectronupConfig) => UserElectronupConfig;
+interface TsupConfig {
+  external?: (string | RegExp)[];
+  noExternal?: (string | RegExp)[];
+}
+
+interface BuilderConfig extends Configuration { }
+
+interface ElectronupConfig {
+  viteConfig?: ViteConfig
+  tsupConfig?: TsupConfig
+  preloadTsup?: Options | Options[]
+  builderConfig: BuilderConfig
+
+  /**
+   * 渲染进程入口目录
+   * @default 'render'
+   */
+  renderDir?: string
+
+  /**
+   * 主进程入口目录
+   * @default 'main'
+   */
+  mainDir?: string
+
+  /**
+  * 静态资源目录
+  * @default 'public'
+  */
+  publicDir?: string
+
+  /**
+  * 动态库目录
+  * @default 'lib'
+  */
+  libDir?: string
+
+  /**
+  * 资源构建输出目录
+  * @default 'dist'
+  */
+  resourceDir?: string
+
+  /**
+   * electron-builder 输出目录
+   * @default 'out'
+   */
+  outDir?: string
+}
+
+interface ConfigEnv {
+  command: 'build' | 'serve'
+  root: string
+}
+
+
+type ElectronupConfigAsyncFn = (env: ConfigEnv) => Promise<ElectronupConfig>
+type ElectronupConfigFn = (env: ConfigEnv) => ElectronupConfig
+
+declare function defineConfig(config: ElectronupConfig): ElectronupConfig;
+declare function defineConfig(config: Promise<ElectronupConfig>): Promise<ElectronupConfig>;
+declare function defineConfig(config: ElectronupConfigFn): ElectronupConfigFn;
+declare function defineConfig(config: ElectronupConfigAsyncFn): ElectronupConfigAsyncFn;
 
 export { BuilderConfig, ConfigEnv, ElectronupConfig, TsupConfig, ViteConfig, defineConfig };

package/dist/client/index.js

@@ -3,10 +3,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -19,12 +15,4 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 
 // index.ts
 var electronup_exports = {};
-__export(electronup_exports, {
-  defineConfig: () => defineConfig
-});
 module.exports = __toCommonJS(electronup_exports);
-var defineConfig = (config) => config;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  defineConfig
-});

package/dist/client/index.mjs

@@ -1,5 +0,0 @@
-// index.ts
-var defineConfig = (config) => config;
-export {
-  defineConfig
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electronup",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "融合构建 electron 应用需要的构建工具,保留原有配置习惯的命令行工具 ",
   "author": "quiteer",
   "license": "MIT",