vite-plugin-blocklet 0.7.5 → 0.7.6

package/dist/index.cjs

@@ -14,6 +14,7 @@ var YAML = require('yaml');
 var isMobile = require('ismobilejs');
 var getPort = require('get-port');
 var mri = require('mri');
+var dotenv = require('dotenv');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -25,6 +26,7 @@ var YAML__default = /*#__PURE__*/_interopDefaultLegacy(YAML);
 var isMobile__default = /*#__PURE__*/_interopDefaultLegacy(isMobile);
 var getPort__default = /*#__PURE__*/_interopDefaultLegacy(getPort);
 var mri__default = /*#__PURE__*/_interopDefaultLegacy(mri);
+var dotenv__default = /*#__PURE__*/_interopDefaultLegacy(dotenv);
 
 const { types } = Mcrypto__default["default"];
 
@@ -418,25 +420,30 @@ async function setupClient(app, options = {}) {
     const { host = '127.0.0.1', protocol = 'ws', port: inputPort, configFile = '', appType = 'spa' } = options;
     let skipWritePort = true;
     let envAppendContent = '';
-    const envFile = path__default["default"].join(process.cwd(), '.env.development.local');
+    let envObject = '';
+    const envFilePath = path__default["default"].join(process.cwd(), '.env.development.local');
     let port;
 
-    if (!fs__default["default"].existsSync(envFile)) {
+    if (!fs__default["default"].existsSync(envFilePath)) {
       skipWritePort = false;
       port = await getPort__default["default"]({ port: inputPort });
-      envAppendContent = `VITE_BLOCKLET_PORT=${port}`;
+      envAppendContent = `BLOCKLET_VITE_PORT=${port}`;
     } else {
       port = await getPort__default["default"]({ port: inputPort });
-      const content = await fs__default["default"].promises.readFile(envFile, 'utf-8');
-      if (!content.includes('VITE_BLOCKLET_PORT')) {
+      const envContent = await fs__default["default"].promises.readFile(envFilePath, 'utf-8');
+      envObject = dotenv__default["default"].parse(envContent);
+
+      if (!envObject.BLOCKLET_VITE_PORT) {
         skipWritePort = false;
-        envAppendContent = `${content}\nVITE_BLOCKLET_PORT=${port}`;
+        envAppendContent = `${envContent}\nBLOCKLET_VITE_PORT=${port}`;
       } else {
-        port = process.env.VITE_BLOCKLET_PORT;
+        port = process.env.BLOCKLET_VITE_PORT;
       }
     }
     if (!skipWritePort && envAppendContent) {
-      await fs__default["default"].promises.writeFile(envFile, envAppendContent);
+      // TODO @zhanghan 常见的 env file 处理暂不支持保留 comment，所以不能通过解析后的对象来写入文件
+      // @see https://github.com/bevry/envfile/pull/213
+      await fs__default["default"].promises.writeFile(envFilePath, envAppendContent);
     }
     // 以中间件模式创建 Vite 服务器
     const vite$1 = await vite.createServer({

package/libs/client.js

@@ -3,6 +3,7 @@ import path from 'node:path';
 import getPort from 'get-port';
 import { createServer } from 'vite';
 import mri from 'mri';
+import dotenv from 'dotenv';
 
 const argv = process.argv.slice(2);
 const isProduction = process.env.NODE_ENV === 'production' || process.env.ABT_NODE_SERVICE_ENV === 'production';
@@ -29,25 +30,30 @@ export default async function setupClient(app, options = {}) {
     const { host = '127.0.0.1', protocol = 'ws', port: inputPort, configFile = '', appType = 'spa' } = options;
     let skipWritePort = true;
     let envAppendContent = '';
-    const envFile = path.join(process.cwd(), '.env.development.local');
+    let envObject = '';
+    const envFilePath = path.join(process.cwd(), '.env.development.local');
     let port;
 
-    if (!fs.existsSync(envFile)) {
+    if (!fs.existsSync(envFilePath)) {
       skipWritePort = false;
       port = await getPort({ port: inputPort });
-      envAppendContent = `VITE_BLOCKLET_PORT=${port}`;
+      envAppendContent = `BLOCKLET_VITE_PORT=${port}`;
     } else {
       port = await getPort({ port: inputPort });
-      const content = await fs.promises.readFile(envFile, 'utf-8');
-      if (!content.includes('VITE_BLOCKLET_PORT')) {
+      const envContent = await fs.promises.readFile(envFilePath, 'utf-8');
+      envObject = dotenv.parse(envContent);
+
+      if (!envObject.BLOCKLET_VITE_PORT) {
         skipWritePort = false;
-        envAppendContent = `${content}\nVITE_BLOCKLET_PORT=${port}`;
+        envAppendContent = `${envContent}\nBLOCKLET_VITE_PORT=${port}`;
       } else {
-        port = process.env.VITE_BLOCKLET_PORT;
+        port = process.env.BLOCKLET_VITE_PORT;
       }
     }
     if (!skipWritePort && envAppendContent) {
-      await fs.promises.writeFile(envFile, envAppendContent);
+      // TODO @zhanghan 常见的 env file 处理暂不支持保留 comment，所以不能通过解析后的对象来写入文件
+      // @see https://github.com/bevry/envfile/pull/213
+      await fs.promises.writeFile(envFilePath, envAppendContent);
     }
     // 以中间件模式创建 Vite 服务器
     const vite = await createServer({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-blocklet",
   "type": "module",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "",
   "main": "index.js",
   "files": [
@@ -30,6 +30,7 @@
     "@arcblock/did": "^1.18.108",
     "@ocap/mcrypto": "^1.18.108",
     "@ocap/util": "^1.18.108",
+    "dotenv": "^16.4.5",
     "get-port": "^5.1.1",
     "ismobilejs": "^1.1.1",
     "mri": "^1.2.0",