electronup 0.0.1 → 0.0.3

package/README.md

@@ -1,4 +1,4 @@
-# @quiteer/electronup
+# electronup
 
 
 > 融合构建 electron 应用需要的构建工具,保留原有配置习惯的命令行工具 
@@ -81,7 +81,7 @@ pnpm add @quiteer/electronup -D
 ```json
 {
   "dependencies": {
-    "@quiteer/resolve-config": "workspace:^0.0.4",
+    "@quiteer/parser-config": "^1.0.3",
     "cac": "^6.7.14",
     "dotenv": "^16.0.3",
     "electron-builder": "^23.6.0",

package/dist/bin/electronup.js

@@ -7,9 +7,6 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -31,37 +28,13 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 
-// node_modules/.pnpm/electron@22.3.14/node_modules/electron/index.js
-var require_electron = __commonJS({
-  "node_modules/.pnpm/electron@22.3.14/node_modules/electron/index.js"(exports, module2) {
-    var fs = require("fs");
-    var path2 = require("path");
-    var pathFile = path2.join(__dirname, "path.txt");
-    function getElectronPath() {
-      let executablePath;
-      if (fs.existsSync(pathFile)) {
-        executablePath = fs.readFileSync(pathFile, "utf-8");
-      }
-      if (process.env.ELECTRON_OVERRIDE_DIST_PATH) {
-        return path2.join(process.env.ELECTRON_OVERRIDE_DIST_PATH, executablePath || "electron");
-      }
-      if (executablePath) {
-        return path2.join(__dirname, "dist", executablePath);
-      } else {
-        throw new Error("Electron failed to install correctly, please delete node_modules/electron and try installing again");
-      }
-    }
-    module2.exports = getElectronPath();
-  }
-});
-
 // src/cli.ts
 var import_path6 = require("path");
 var import_cac = require("cac");
 var import_rimraf = require("rimraf");
 
 // package.json
-var version = "0.0.1";
+var version = "0.0.3";
 
 // src/transform/getConfig.ts
 var import_path = require("path");
@@ -185,7 +158,7 @@ async function getBuilderConfig(config, allConfig) {
 var import_path3 = require("path");
 var import_child_process = require("child_process");
 var import_dotenv = require("dotenv");
-var import_electron = __toESM(require_electron());
+var import_electron = __toESM(require("electron"));
 var defaultEnvPath = (0, import_path3.resolve)(store.root, ".env");
 var { parsed: defaultEnv } = (0, import_dotenv.config)({ path: defaultEnvPath });
 var getModeDev = () => {
@@ -216,11 +189,9 @@ var injectEnv = () => {
 function getTsupConfig(config, allConfig) {
   const { command, root, minify } = store;
   const isServe = command === "serve";
-  const userConfig = {
-    minify: minify === false ? false : isServe,
-    ...config
-  };
   const defaultConfig = {
+    target: "es5",
+    minify: minify === false ? false : isServe,
     external: ["electron", ...config.external ?? []],
     noExternal: config.noExternal,
     entry: { electron: (0, import_path3.resolve)(root, allConfig.mainDir || "main" /* mainDir */, "index.ts") },
@@ -234,8 +205,7 @@ function getTsupConfig(config, allConfig) {
         return startElectron((0, import_path3.resolve)(root, allConfig.resourceDir || "dist/resource" /* resourceDir */, "electron.js"));
     }
   };
-  config.target && (defaultConfig.target = config.target);
-  return { ...userConfig, ...defaultConfig };
+  return { ...config, ...defaultConfig };
 }
 var electronProcess;
 var manualRestart = false;
@@ -277,21 +247,15 @@ function getViteConfig(config, allConfig) {
   const { root, minify } = store;
   const defaultConfig = {
     base: "./",
-    root: allConfig.renderDir || "render" /* renderDir */,
-    server: { host: "0.0.0.0" },
+    ...config,
     build: {
-      outDir: (0, import_path4.resolve)(root, allConfig.resourceDir || "dist/resource" /* resourceDir */),
-      target: "esnext",
+      ...config?.build,
       minify: minify && "esbuild",
-      reportCompressedSize: false,
-      emptyOutDir: true,
-      ...config?.build
+      outDir: (0, import_path4.resolve)(root, allConfig.resourceDir || "dist/resource" /* resourceDir */)
     },
-    ...config.viteOptions
+    root: allConfig.renderDir || "render" /* renderDir */,
+    publicDir: (0, import_path4.resolve)(root, allConfig.publicDir || "public" /* publicDir */)
   };
-  config?.resolve && (defaultConfig.resolve = config.resolve);
-  config?.plugins && (defaultConfig.plugins = config.plugins);
-  defaultConfig.publicDir = (0, import_path4.resolve)(root, allConfig.publicDir || "public" /* publicDir */);
   return defaultConfig;
 }
 
@@ -310,17 +274,17 @@ async function getElectronupConfig(config) {
 }
 
 // src/transform/getExportConfig.ts
-var exportElectronupConfig = (config) => {
+var exportElectronupConfig = async (config) => {
   const typeStr = typeof config;
   if (typeStr === "function") {
-    const option = config({ command: store.command, root: store.root });
+    const option = await config({ command: store.command, root: store.root });
     return option;
   }
   if (typeStr === "object")
     return config;
   throw new Error("electronup \u914D\u7F6E\u9519\u8BEF,\u89E3\u6790\u5931\u8D25\uFF01");
 };
-var electronupConfig = (config) => getElectronupConfig(exportElectronupConfig(config));
+var electronupConfig = async (config) => getElectronupConfig(await exportElectronupConfig(config));
 
 // src/runner/watch.ts
 var import_portfinder = require("portfinder");
@@ -472,7 +436,7 @@ cli.command("[config-file]", "start dev server").alias("dev").option("-p , --por
   store.minify = !!minify;
   watch(option);
 });
-cli.command("build [root]", "\u6784\u5EFA").option("-o , --option", "\u81EA\u5B9A\u4E49 , \u81EA\u5B9A\u4E49\u6784\u5EFA\u9009\u9879 ").option("--dir", "\u53EA\u751F\u6210\u76EE\u5F55").option("--no-asar", "asar false").option("--win", " \u6784\u5EFA win \u4E0B\u8F93\u51FA\u5305").option("--mac", " \u6784\u5EFA mac \u4E0B\u8F93\u51FA\u5305").option("--linux", " \u6784\u5EFA linux \u8F93\u51FA\u5305").option("--ia32", " \u6784\u5EFA ia32 \u5E73\u53F0\u5305").option("--x64", " \u6784\u5EFA x64 \u5E73\u53F0\u5305").option("--arm64", " \u6784\u5EFA arm64 \u5E73\u53F0\u5305").option("--armv7l", " \u6784\u5EFA armv7l \u5E73\u53F0\u5305").option("--universal", " \u6784\u5EFA universal \u5E73\u53F0\u5305").action(async (configFile, options) => {
+cli.command("build [root]", "\u6784\u5EFA").option("-o , --option", "\u81EA\u5B9A\u4E49 , \u81EA\u5B9A\u4E49\u6784\u5EFA\u9009\u9879 ").option("--dir", "\u53EA\u751F\u6210\u76EE\u5F55").option("--no-asar", "asar false").option("--win", " \u6784\u5EFA win \u5E73\u53F0\u4E0B\u7684\u8F93\u51FA\u5305").option("--mac", " \u6784\u5EFA mac \u5E73\u53F0\u4E0B\u7684\u8F93\u51FA\u5305").option("--linux", " \u6784\u5EFA linux \u5E73\u53F0\u4E0B\u7684\u8F93\u51FA\u5305").option("--ia32", " \u6784\u5EFA ia32 \u67B6\u6784").option("--x64", " \u6784\u5EFA x64 \u67B6\u6784").option("--arm64", " \u6784\u5EFA arm64 \u67B6\u6784").option("--armv7l", " \u6784\u5EFA armv7l \u67B6\u6784").option("--universal", " \u6784\u5EFA universal \u5E73\u53F0\u5305").action(async (configFile, options) => {
   const {
     mode,
     minify,

package/dist/client/index.d.ts

@@ -1,18 +1,10 @@
 import { Configuration } from 'electron-builder';
-import { ResolveOptions, AliasOptions, PluginOption, UserConfig } from 'vite';
+import { UserConfig } from 'vite';
 import { Options } from 'tsup';
 
-interface ViteConfig {
-  resolve?: ResolveOptions & {
-    alias?: AliasOptions;
-  }
-  plugins?: PluginOption[]
-  build?:UserConfig['build']
-  viteOptions?: Omit<UserConfig, 'plugins' | 'resolve' | 'publicDir'| 'build'>
-}
+type ViteConfig = Omit<UserConfig, 'publicDir'>
 
 interface TsupConfig {
-  target?: Options['target'];
   external?: (string | RegExp)[];
   noExternal?: (string | RegExp)[];
 }
@@ -67,7 +59,7 @@ interface ConfigEnv {
   root: string
 }
 
-type ElectronupConfigFn = (env: ConfigEnv) => ElectronupConfig
+type ElectronupConfigFn = (env: ConfigEnv) => ElectronupConfig | Promise<ElectronupConfig>
 type UserElectronupConfig = ElectronupConfig | ElectronupConfigFn
 
 declare const defineConfig: (config: UserElectronupConfig) => UserElectronupConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electronup",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "融合构建 electron 应用需要的构建工具,保留原有配置习惯的命令行工具 ",
   "author": "quiteer",
   "license": "MIT",
@@ -38,6 +38,7 @@
   },
   "peerDependencies": {
     "@types/node": ">= 16",
+    "electron": ">= 20",
     "node": ">= 16",
     "vue": ">= 3"
   },