@tomjs/vite-plugin-electron 1.6.0 → 1.7.1

package/README.md

@@ -96,7 +96,7 @@ import { app, BrowserWindow } from 'electron';
 global.__dirname = dirname(fileURLToPath(import.meta.url));
 
 const preload = join(__dirname, '../preload/index.mjs');
-const url = process.env.APP_DEV_SERVER_URL;
+const url = process.env.VITE_DEV_SERVER_URL;
 
 async function createWindow() {
   win = new BrowserWindow({
@@ -314,9 +314,9 @@ const config = {
 
 Electron `main process` and `renderer process` use.
 
-| Variable           | Description                |
-| ------------------ | -------------------------- |
-| APP_DEV_SERVER_URL | The url of the dev server. |
+| Variable              | Description                |
+| --------------------- | -------------------------- |
+| `VITE_DEV_SERVER_URL` | The url of the dev server. |
 
 ## Debug
 

package/README.zh_CN.md

@@ -96,7 +96,7 @@ import { app, BrowserWindow } from 'electron';
 global.__dirname = dirname(fileURLToPath(import.meta.url));
 
 const preload = join(__dirname, '../preload/index.mjs');
-const url = process.env.APP_DEV_SERVER_URL;
+const url = process.env.VITE_DEV_SERVER_URL;
 
 async function createWindow() {
   win = new BrowserWindow({
@@ -313,9 +313,9 @@ const config = {
 
 Electron `main process` 和 `renderer process` 使用。
 
-| 变量               | 描述                  |
-| ------------------ | --------------------- |
-| APP_DEV_SERVER_URL | Vite 开发服务器的 URL |
+| 变量                  | 描述                  |
+| --------------------- | --------------------- |
+| `VITE_DEV_SERVER_URL` | Vite 开发服务器的 URL |
 
 ## 调试
 

package/dist/index.js

@@ -1,6 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/index.ts
 var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
-var _process = require('process');
 var _lodashclonedeep = require('lodash.clonedeep'); var _lodashclonedeep2 = _interopRequireDefault(_lodashclonedeep);
 var _lodashmerge = require('lodash.merge'); var _lodashmerge2 = _interopRequireDefault(_lodashmerge);
 var _path = require('path'); var _path2 = _interopRequireDefault(_path);
@@ -8,7 +7,7 @@ var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 // src/builder.ts
 var _os = require('os'); var _os2 = _interopRequireDefault(_os);
 
-
+var _process = require('process');
 
 var _shelljs = require('shelljs'); var _shelljs2 = _interopRequireDefault(_shelljs);
 
@@ -18,7 +17,6 @@ var _kolorist = require('kolorist');
 
 // src/constants.ts
 var PLUGIN_NAME = "@tomjs:electron";
-var PACKAGE_NAME = "@tomjs/vite-plugin-electron";
 
 // src/logger.ts
 var Logger = class {
@@ -71,6 +69,30 @@ function readJson(path3) {
 function writeJson(path3, data) {
   _fs2.default.writeFileSync(path3, JSON.stringify(data, null, 2), "utf8");
 }
+function resolveHostname(hostname) {
+  const loopbackHosts = /* @__PURE__ */ new Set([
+    "localhost",
+    "127.0.0.1",
+    "::1",
+    "0000:0000:0000:0000:0000:0000:0000:0001"
+  ]);
+  const wildcardHosts = /* @__PURE__ */ new Set(["0.0.0.0", "::", "0000:0000:0000:0000:0000:0000:0000:0000"]);
+  return loopbackHosts.has(hostname) || wildcardHosts.has(hostname) ? "localhost" : hostname;
+}
+function resolveServerUrl(server) {
+  const addressInfo = server.httpServer.address();
+  const isAddressInfo = (x) => x == null ? void 0 : x.address;
+  if (isAddressInfo(addressInfo)) {
+    const { address, port } = addressInfo;
+    const hostname = resolveHostname(address);
+    const options = server.config.server;
+    const protocol = options.https ? "https" : "http";
+    const devBase = server.config.base;
+    const path3 = typeof options.open === "string" ? options.open : devBase;
+    const url = path3.startsWith("http") ? path3 : `${protocol}://${hostname}:${port}${path3}`;
+    return url;
+  }
+}
 
 // src/builder.ts
 var logger = createLogger();
@@ -373,6 +395,11 @@ function preMergeOptions(options) {
     } else if (typeof entry === "string") {
       opt.entry = [entry];
     }
+    if (isDev) {
+      opt.sourcemap ??= true;
+    } else {
+      opt.minify ??= true;
+    }
     const external = opt.external || opts.external || ["electron"];
     opt.external = [...new Set(["electron"].concat(external))];
   });
@@ -420,24 +447,7 @@ function useElectronPlugin(options) {
         opts.main.outDir ||= _path2.default.join("dist-electron", "main");
         opts.preload.outDir ||= _path2.default.join("dist-electron", "preload");
       }
-      if (isDev) {
-        opts.main.sourcemap ??= true;
-        opts.preload.sourcemap ??= true;
-      } else {
-        opts.main.minify ??= true;
-        opts.preload.minify ??= true;
-      }
-      let envPrefix = config.envPrefix;
-      if (!envPrefix) {
-        envPrefix = ["VITE_"];
-      } else if (typeof envPrefix === "string") {
-        envPrefix = [envPrefix];
-      }
-      if (!envPrefix.includes("APP_")) {
-        envPrefix.push("APP_");
-      }
       return {
-        envPrefix: [...new Set(envPrefix)],
         build: {
           outDir
         }
@@ -454,19 +464,13 @@ function useElectronPlugin(options) {
         return;
       }
       server.httpServer.on("listening", async () => {
-        var _a;
-        const serve = (_a = server.httpServer) == null ? void 0 : _a.address();
-        const { address, port, family } = serve;
-        const hostname = family === "IPv6" ? `[${address}]` : address;
-        const protocol = server.config.server.https ? "https" : "http";
-        process.env.APP_DEV_SERVER_URL = `${protocol}://${hostname}:${port}`;
-        const DEBUG_PATH = _path2.default.resolve(_process.cwd.call(void 0, ), "node_modules", PACKAGE_NAME, "debug");
-        if (!_fs2.default.existsSync(DEBUG_PATH)) {
-          _fs.mkdirSync.call(void 0, DEBUG_PATH, { recursive: true });
-        }
-        const env = Object.keys(process.env).filter((s) => s.startsWith("APP_") || s.startsWith("VITE_")).map((s) => `${s}=${process.env[s]}`).join("\n");
-        _fs.writeFileSync.call(void 0, _path2.default.join(DEBUG_PATH, ".env"), `NODE_ENV=development
-${env}`);
+        const env = {
+          NODE_ENV: server.config.mode || "development",
+          VITE_DEV_SERVER_URL: resolveServerUrl(server)
+        };
+        ["main", "preload"].forEach((prop) => {
+          opts[prop].env = env;
+        });
         await runServe(opts, server);
       });
     },

package/dist/index.mjs

@@ -1,6 +1,5 @@
 // src/index.ts
-import fs2, { mkdirSync, writeFileSync } from "fs";
-import { cwd as cwd2 } from "process";
+import fs2 from "fs";
 import cloneDeep from "lodash.clonedeep";
 import merge2 from "lodash.merge";
 import path2 from "path";
@@ -18,7 +17,6 @@ import { blue, gray, green, red, yellow } from "kolorist";
 
 // src/constants.ts
 var PLUGIN_NAME = "@tomjs:electron";
-var PACKAGE_NAME = "@tomjs/vite-plugin-electron";
 
 // src/logger.ts
 var Logger = class {
@@ -70,6 +68,30 @@ function readJson(path3) {
 function writeJson(path3, data) {
   fs.writeFileSync(path3, JSON.stringify(data, null, 2), "utf8");
 }
+function resolveHostname(hostname) {
+  const loopbackHosts = /* @__PURE__ */ new Set([
+    "localhost",
+    "127.0.0.1",
+    "::1",
+    "0000:0000:0000:0000:0000:0000:0000:0001"
+  ]);
+  const wildcardHosts = /* @__PURE__ */ new Set(["0.0.0.0", "::", "0000:0000:0000:0000:0000:0000:0000:0000"]);
+  return loopbackHosts.has(hostname) || wildcardHosts.has(hostname) ? "localhost" : hostname;
+}
+function resolveServerUrl(server) {
+  const addressInfo = server.httpServer.address();
+  const isAddressInfo = (x) => x == null ? void 0 : x.address;
+  if (isAddressInfo(addressInfo)) {
+    const { address, port } = addressInfo;
+    const hostname = resolveHostname(address);
+    const options = server.config.server;
+    const protocol = options.https ? "https" : "http";
+    const devBase = server.config.base;
+    const path3 = typeof options.open === "string" ? options.open : devBase;
+    const url = path3.startsWith("http") ? path3 : `${protocol}://${hostname}:${port}${path3}`;
+    return url;
+  }
+}
 
 // src/builder.ts
 var logger = createLogger();
@@ -372,6 +394,11 @@ function preMergeOptions(options) {
     } else if (typeof entry === "string") {
       opt.entry = [entry];
     }
+    if (isDev) {
+      opt.sourcemap ??= true;
+    } else {
+      opt.minify ??= true;
+    }
     const external = opt.external || opts.external || ["electron"];
     opt.external = [...new Set(["electron"].concat(external))];
   });
@@ -419,24 +446,7 @@ function useElectronPlugin(options) {
         opts.main.outDir ||= path2.join("dist-electron", "main");
         opts.preload.outDir ||= path2.join("dist-electron", "preload");
       }
-      if (isDev) {
-        opts.main.sourcemap ??= true;
-        opts.preload.sourcemap ??= true;
-      } else {
-        opts.main.minify ??= true;
-        opts.preload.minify ??= true;
-      }
-      let envPrefix = config.envPrefix;
-      if (!envPrefix) {
-        envPrefix = ["VITE_"];
-      } else if (typeof envPrefix === "string") {
-        envPrefix = [envPrefix];
-      }
-      if (!envPrefix.includes("APP_")) {
-        envPrefix.push("APP_");
-      }
       return {
-        envPrefix: [...new Set(envPrefix)],
         build: {
           outDir
         }
@@ -453,19 +463,13 @@ function useElectronPlugin(options) {
         return;
       }
       server.httpServer.on("listening", async () => {
-        var _a;
-        const serve = (_a = server.httpServer) == null ? void 0 : _a.address();
-        const { address, port, family } = serve;
-        const hostname = family === "IPv6" ? `[${address}]` : address;
-        const protocol = server.config.server.https ? "https" : "http";
-        process.env.APP_DEV_SERVER_URL = `${protocol}://${hostname}:${port}`;
-        const DEBUG_PATH = path2.resolve(cwd2(), "node_modules", PACKAGE_NAME, "debug");
-        if (!fs2.existsSync(DEBUG_PATH)) {
-          mkdirSync(DEBUG_PATH, { recursive: true });
-        }
-        const env = Object.keys(process.env).filter((s) => s.startsWith("APP_") || s.startsWith("VITE_")).map((s) => `${s}=${process.env[s]}`).join("\n");
-        writeFileSync(path2.join(DEBUG_PATH, ".env"), `NODE_ENV=development
-${env}`);
+        const env = {
+          NODE_ENV: server.config.mode || "development",
+          VITE_DEV_SERVER_URL: resolveServerUrl(server)
+        };
+        ["main", "preload"].forEach((prop) => {
+          opts[prop].env = env;
+        });
         await runServe(opts, server);
       });
     },

package/env.d.ts

@@ -12,6 +12,6 @@ declare namespace NodeJS {
     /**
      * The url of the dev server.
      */
-    APP_DEV_SERVER_URL?: string;
+    VITE_DEV_SERVER_URL?: string;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomjs/vite-plugin-electron",
-  "version": "1.6.0",
+  "version": "1.7.1",
   "description": "A simple vite plugin for electron, supports esm/cjs, support esm in electron v28+",
   "keywords": [
     "vite",
@@ -38,7 +38,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/tomgao365/vite-plugin-electron.git"
+    "url": "git+https://github.com/tomjs/vite-plugin-electron.git"
   },
   "dependencies": {
     "dayjs": "^1.11.10",
@@ -51,25 +51,25 @@
   },
   "devDependencies": {
     "@commitlint/cli": "^18.4.3",
-    "@tomjs/commitlint": "^2.0.5",
-    "@tomjs/eslint": "^1.1.1",
-    "@tomjs/prettier": "^1.0.6",
-    "@tomjs/stylelint": "^1.1.1",
-    "@tomjs/tsconfig": "^1.1.2",
+    "@tomjs/commitlint": "^2.1.1",
+    "@tomjs/eslint": "^1.2.1",
+    "@tomjs/prettier": "^1.1.1",
+    "@tomjs/stylelint": "^2.1.1",
+    "@tomjs/tsconfig": "^1.2.1",
     "@types/lodash.clonedeep": "^4.5.9",
     "@types/lodash.merge": "^4.6.9",
     "@types/node": "^18.19.3",
     "@types/shelljs": "^0.8.15",
-    "eslint": "^8.55.0",
+    "eslint": "^8.56.0",
     "husky": "^8.0.3",
     "lint-staged": "^15.2.0",
     "np": "^9.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.1.1",
     "rimraf": "^5.0.5",
-    "stylelint": "^15.11.0",
-    "tsx": "^4.6.2",
-    "typescript": "~5.2.2"
+    "stylelint": "^16.0.2",
+    "tsx": "^4.7.0",
+    "typescript": "~5.3.3"
   },
   "peerDependencies": {
     "electron": ">=12.0.0",