electronup 0.2.1 → 0.2.3

package/dist/bin/electronup.mjs

@@ -5,7 +5,7 @@ import { cac } from "cac";
 import process from "node:process";
 import * as prompts from "@clack/prompts";
 import { Arch, Platform, build } from "electron-builder";
-import { pathExists, readJSON, writeFile } from "fs-extra";
+import fsExtra from "fs-extra";
 import { blue, green, red, yellow } from "kolorist";
 import { build as build$1, createServer } from "vite";
 import { stringify } from "yaml";
@@ -16,10 +16,10 @@ import electron from "electron";
 import { getPortPromise } from "portfinder";
 
 //#region package.json
-var version = "0.2.1";
+var version = "0.2.3";
 
 //#endregion
-//#region utils/dirs.ts
+//#region src/utils/dirs.ts
 let DefaultDirs = /* @__PURE__ */ function(DefaultDirs) {
 	DefaultDirs["renderDir"] = "render";
 	DefaultDirs["mainDir"] = "main";
@@ -31,7 +31,7 @@ let DefaultDirs = /* @__PURE__ */ function(DefaultDirs) {
 }({});
 
 //#endregion
-//#region utils/store.ts
+//#region src/utils/store.ts
 var Store = class Store {
 	static instance;
 	command;
@@ -75,10 +75,11 @@ var Store = class Store {
 const store = Store.getInstance();
 
 //#endregion
-//#region transform/getConfig.ts
+//#region src/transform/getConfig.ts
 const NOT_FOUND = "找不到 electronup.config.ts | electronup.config.js | electronup.config.json , 请在根目录下添加配置文件 , 或显式的指定配置文件路径（相对于根目录）";
 const PARSING_FAILED = "找到了配置文件,但解析配置文件失败！";
 async function configPath(filePath) {
+	const { pathExists } = fsExtra;
 	const { root } = store;
 	if (filePath) return join(root, filePath);
 	const configList = [
@@ -102,11 +103,12 @@ async function getConfig(filePath) {
 }
 
 //#endregion
-//#region configs/builder.ts
+//#region src/configs/builder.ts
 /**
 *  CliOptions 配置直接
 */
 async function getBuilderConfig(config, allConfig) {
+	const { readJSON } = fsExtra;
 	const packages = await readJSON(resolve(store.root, "package.json"));
 	const defaultConfig = {
 		asar: store.asar,
@@ -139,7 +141,7 @@ async function getBuilderConfig(config, allConfig) {
 }
 
 //#endregion
-//#region configs/tsdown.ts
+//#region src/configs/tsdown.ts
 /**
 * Description  全局的环境变量路径
 * @param {any} store.root
@@ -222,7 +224,11 @@ function startElectron(mainPath) {
 			manualRestart = false;
 		}, 5e3);
 	}
-	electronProcess = spawn(electron, [mainPath]);
+	const env = {
+		...process.env,
+		...injectEnv()
+	};
+	electronProcess = spawn(electron, [mainPath], { env });
 	electronProcess.stdout.on("data", removeJunk);
 	electronProcess.stderr.on("data", removeJunk);
 	electronProcess.on("close", () => {
@@ -242,7 +248,7 @@ function removeJunk(chunk) {
 }
 
 //#endregion
-//#region configs/vite.ts
+//#region src/configs/vite.ts
 function getViteConfig(config, allConfig) {
 	const { root, minify } = store;
 	return {
@@ -259,7 +265,7 @@ function getViteConfig(config, allConfig) {
 }
 
 //#endregion
-//#region configs/electronup.ts
+//#region src/configs/electronup.ts
 async function getElectronupConfig(config) {
 	const { viteConfig, tsdownConfig, preload, builderConfig, ...dirConfig } = config;
 	const initConfig = {
@@ -275,7 +281,7 @@ async function getElectronupConfig(config) {
 }
 
 //#endregion
-//#region transform/getExportConfig.ts
+//#region src/transform/getExportConfig.ts
 /**
 * Description  解析用户自定义配置···
 * @param {any} config:ElectronupConfigExport
@@ -293,7 +299,7 @@ async function exportElectronupConfig(config) {
 const electronupConfig = async (config) => getElectronupConfig(await exportElectronupConfig(config));
 
 //#endregion
-//#region runner/build.ts
+//#region src/runner/build.ts
 const platformSelect = [
 	{
 		name: "Windows",
@@ -378,6 +384,7 @@ const platformSelect = [
 	}
 ];
 async function build$2(options) {
+	const { writeFile } = fsExtra;
 	if (store.option) try {
 		const isMinify = await prompts.confirm({ message: green("是否压缩代码?") });
 		if (prompts.isCancel(isMinify)) throw new Error(`${red("✖")} Operation cancelled`);
@@ -434,7 +441,7 @@ async function build$2(options) {
 }
 
 //#endregion
-//#region runner/watch.ts
+//#region src/runner/watch.ts
 async function watch(options) {
 	const p = await getPortPromise({ port: Number(store.port) });
 	store.port = p;
@@ -449,7 +456,7 @@ async function watch(options) {
 }
 
 //#endregion
-//#region cli.ts
+//#region src/cli.ts
 const cli = cac("electronup");
 cli.option("-m , --mode <mode>", "[development | production | test | staging | ...] 环境模式 ");
 cli.option("--no-minify", "使主进程和渲染进程代码不进行压缩 ");

package/dist/client/index.d.mts

@@ -2,7 +2,7 @@ import { Configuration } from "electron-builder";
 import { UserConfig } from "tsdown";
 import { UserConfig as UserConfig$1 } from "vite";
 
-//#region typings/electronup.d.ts
+//#region src/typings/electronup.d.ts
 interface ViteConfig extends Omit<UserConfig$1, 'publicDir' | 'ssr'> {}
 interface TsdownConfig {
   external?: (string | RegExp)[];
@@ -54,7 +54,7 @@ type ElectronupConfigFnPromise = (env: ConfigEnv) => Promise<ElectronupConfig>;
 type ElectronupConfigFn = (env: ConfigEnv) => ElectronupConfig | Promise<ElectronupConfig>;
 type ElectronupConfigExport = ElectronupConfig | Promise<ElectronupConfig> | ElectronupConfigFnObject | ElectronupConfigFnPromise | ElectronupConfigFn;
 //#endregion
-//#region index.d.ts
+//#region src/index.d.ts
 declare function defineConfig(config: ElectronupConfig): ElectronupConfig;
 declare function defineConfig(config: Promise<ElectronupConfig>): Promise<ElectronupConfig>;
 declare function defineConfig(config: ElectronupConfigFnObject): ElectronupConfigFnObject;

package/dist/client/index.mjs

@@ -1,7 +1,8 @@
-//#region index.ts
+//#region src/index.ts
 function defineConfig(config) {
 	return config;
 }
+console.log("test :>> ");
 
 //#endregion
 export { defineConfig };

package/package.json

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