vite-plugin-blocklet 0.8.3 → 0.8.5

package/dist/index.cjs

@@ -14,7 +14,6 @@ var getPort = require('get-port');
 var mri = require('mri');
 var httpProxyMiddleware = require('http-proxy-middleware');
 
-var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 const { types } = Mcrypto;
 
 function toBlockletDid(name) {
@@ -35,11 +34,11 @@ const blockletPrefix = process.env.BLOCKLET_DEV_MOUNT_POINT || '/';
  *
  * @param {Object} options - The options for the HMR plugin.
  * @param {string} options.version - The version of the vite version.
- * @param {'middleware'|'client'} options.hmrMode - The version of the vite version.
+ * @param {'middleware'|'client'|'server'} options.hmrMode - The version of the vite version.
  * @return {Object} The HMR plugin object.
  */
 function createHmrPlugin(options = {}) {
-  const { version = vite.version } = options;
+  const { version = vite.version, hmrMode = process.env.VITE_HMR_MODE || 'client' } = options || {};
   return {
     name: 'blocklet:hmr',
     apply: 'serve',
@@ -56,9 +55,11 @@ function createHmrPlugin(options = {}) {
           return replacedCode;
         }
 
-        replacedCode = replacedCode.replace(/__HMR_BASE__/g, `"${blockletPrefix}"+__HMR_BASE__`);
+        if (['client', 'middleware'].includes(hmrMode)) {
+          replacedCode = replacedCode.replace(/__HMR_BASE__/g, `"${blockletPrefix}"+__HMR_BASE__`);
+        }
 
-        if (process.env.VITE_HMR_MODE === 'middleware') {
+        if (hmrMode === 'middleware') {
           // 根据页面的协议自动判断端口
           replacedCode = replacedCode.replace(
             /__HMR_PORT__/g,
@@ -406,13 +407,12 @@ function createConfigPlugin(options) {
  *
  * @param {object} options - The options for the plugin.
  * @param {string} options.entryPath - The entry path of the Express app.
+ * @param {array} options.ignorePath - The entry path of the Express app.
  * @return {object} The Vite config plugin.
  */
-function createExpressPlugin({ entryPath }) {
+function createExpressPlugin({ entryPath, ignorePath = [] }) {
+  ignorePath = Array.isArray(ignorePath) ? ignorePath : [ignorePath];
   // 此处需要解构 import.meta 对象，才能拿到 vite.config 的地址，否则拿到的地址会是 express.js 文件的地址
-  const { dirname } = { ...({ url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)) }) };
-  const fullPath = path.join(dirname, entryPath);
-  const folderPath = path.dirname(fullPath);
   return {
     name: 'blocklet:express',
     apply: 'serve',
@@ -432,7 +432,7 @@ function createExpressPlugin({ entryPath }) {
       const invalidatedModules = [];
 
       for (const mod of modules) {
-        if (mod.file.includes(folderPath)) {
+        if (ignorePath.some((x) => mod.file.startsWith(x))) {
           invalidatedModules.push(mod);
         } else {
           validatedModules.push(mod);
@@ -458,7 +458,8 @@ const isProduction = process.env.NODE_ENV === 'production' || process.env.ABT_NO
  * @param {Object} [options={}] - The options object.
  * @param {string} [options.host='127.0.0.1'] - The host for the server.
  * @param {string} [options.protocol='ws'] - The protocol for the server.
- * @param {number} [options.port] - The port for the server.
+ * @param {number} [options.port] - The port for the ws server.
+ * @param {number} [options.clientPort] - The clientPort for the ws server.
  * @param {string} [options.configFile=''] - The path to the config file.
  * @param {string} [options.appType='spa'] - The type of the application.
  * @return {Promise<Object>} A promise that resolves to the Vite server object.
@@ -470,25 +471,38 @@ async function setupClient(app, options = {}) {
         config: 'c',
       },
     });
-    const { port: inputPort, configFile = '', appType = 'spa' } = options;
+    const { host, protocol = 'ws', port: inputPort, configFile = '', appType = 'spa' } = options || {};
     const port = await getPort({ port: inputPort });
-    // 创建 hmr proxy
-    const wsProxy = httpProxyMiddleware.createProxyMiddleware({
-      target: `ws://127.0.0.1:${port}`,
-      ws: true,
-    });
-    process.env.VITE_HMR_MODE = 'middleware';
-    app.use(path.join(blockletPrefix, '/__vite_hmr__'), wsProxy);
+    const clientPort = options?.clientPort || port;
+    const enableWsMiddleware = !host;
+    if (enableWsMiddleware) {
+      process.env.VITE_HMR_MODE = 'middleware';
+      // 创建 hmr proxy
+      const wsProxy = httpProxyMiddleware.createProxyMiddleware({
+        target: `ws://127.0.0.1:${port}`,
+        ws: true,
+      });
+      app.use(path.join(blockletPrefix, '/__vite_hmr__'), wsProxy);
+    } else {
+      process.env.VITE_HMR_MODE = 'server';
+    }
 
     // 以中间件模式创建 Vite 服务器
     const vite$1 = await vite.createServer({
       configFile: params.config || configFile || undefined,
       server: {
         middlewareMode: true,
-        hmr: {
-          port,
-          path: '/__vite_hmr__',
-        },
+        hmr: enableWsMiddleware
+          ? {
+              port,
+              path: '/__vite_hmr__',
+            }
+          : {
+              host,
+              port,
+              clientPort,
+              protocol,
+            },
       },
       appType,
     });

package/libs/client.js

@@ -3,7 +3,7 @@ import getPort from 'get-port';
 import { createServer } from 'vite';
 import mri from 'mri';
 import { createProxyMiddleware } from 'http-proxy-middleware';
-import { blockletPrefix } from './utils';
+import { blockletPrefix } from './utils.js';
 
 const argv = process.argv.slice(2);
 const isProduction = process.env.NODE_ENV === 'production' || process.env.ABT_NODE_SERVICE_ENV === 'production';
@@ -15,7 +15,8 @@ const isProduction = process.env.NODE_ENV === 'production' || process.env.ABT_NO
  * @param {Object} [options={}] - The options object.
  * @param {string} [options.host='127.0.0.1'] - The host for the server.
  * @param {string} [options.protocol='ws'] - The protocol for the server.
- * @param {number} [options.port] - The port for the server.
+ * @param {number} [options.port] - The port for the ws server.
+ * @param {number} [options.clientPort] - The clientPort for the ws server.
  * @param {string} [options.configFile=''] - The path to the config file.
  * @param {string} [options.appType='spa'] - The type of the application.
  * @return {Promise<Object>} A promise that resolves to the Vite server object.
@@ -27,25 +28,38 @@ export default async function setupClient(app, options = {}) {
         config: 'c',
       },
     });
-    const { port: inputPort, configFile = '', appType = 'spa' } = options;
+    const { host, protocol = 'ws', port: inputPort, configFile = '', appType = 'spa' } = options || {};
     const port = await getPort({ port: inputPort });
-    // 创建 hmr proxy
-    const wsProxy = createProxyMiddleware({
-      target: `ws://127.0.0.1:${port}`,
-      ws: true,
-    });
-    process.env.VITE_HMR_MODE = 'middleware';
-    app.use(path.join(blockletPrefix, '/__vite_hmr__'), wsProxy);
+    const clientPort = options?.clientPort || port;
+    const enableWsMiddleware = !host;
+    if (enableWsMiddleware) {
+      process.env.VITE_HMR_MODE = 'middleware';
+      // 创建 hmr proxy
+      const wsProxy = createProxyMiddleware({
+        target: `ws://127.0.0.1:${port}`,
+        ws: true,
+      });
+      app.use(path.join(blockletPrefix, '/__vite_hmr__'), wsProxy);
+    } else {
+      process.env.VITE_HMR_MODE = 'server';
+    }
 
     // 以中间件模式创建 Vite 服务器
     const vite = await createServer({
       configFile: params.config || configFile || undefined,
       server: {
         middlewareMode: true,
-        hmr: {
-          port,
-          path: '/__vite_hmr__',
-        },
+        hmr: enableWsMiddleware
+          ? {
+              port,
+              path: '/__vite_hmr__',
+            }
+          : {
+              host,
+              port,
+              clientPort,
+              protocol,
+            },
       },
       appType,
     });

package/libs/express.js

@@ -1,16 +1,14 @@
-import path from 'node:path';
 /**
  * Creates a config plugin for Vite development server.
  *
  * @param {object} options - The options for the plugin.
  * @param {string} options.entryPath - The entry path of the Express app.
+ * @param {array} options.ignorePath - The entry path of the Express app.
  * @return {object} The Vite config plugin.
  */
-export default function createExpressPlugin({ entryPath }) {
+export default function createExpressPlugin({ entryPath, ignorePath = [] }) {
+  ignorePath = Array.isArray(ignorePath) ? ignorePath : [ignorePath];
   // 此处需要解构 import.meta 对象，才能拿到 vite.config 的地址，否则拿到的地址会是 express.js 文件的地址
-  const { dirname } = { ...import.meta };
-  const fullPath = path.join(dirname, entryPath);
-  const folderPath = path.dirname(fullPath);
   return {
     name: 'blocklet:express',
     apply: 'serve',
@@ -30,7 +28,7 @@ export default function createExpressPlugin({ entryPath }) {
       const invalidatedModules = [];
 
       for (const mod of modules) {
-        if (mod.file.includes(folderPath)) {
+        if (ignorePath.some((x) => mod.file.startsWith(x))) {
           invalidatedModules.push(mod);
         } else {
           validatedModules.push(mod);

package/libs/hmr.js

@@ -7,11 +7,11 @@ import { blockletPrefix, isInBlocklet } from './utils.js';
  *
  * @param {Object} options - The options for the HMR plugin.
  * @param {string} options.version - The version of the vite version.
- * @param {'middleware'|'client'} options.hmrMode - The version of the vite version.
+ * @param {'middleware'|'client'|'server'} options.hmrMode - The version of the vite version.
  * @return {Object} The HMR plugin object.
  */
 export default function createHmrPlugin(options = {}) {
-  const { version = viteVersion } = options;
+  const { version = viteVersion, hmrMode = process.env.VITE_HMR_MODE || 'client' } = options || {};
   return {
     name: 'blocklet:hmr',
     apply: 'serve',
@@ -28,9 +28,11 @@ export default function createHmrPlugin(options = {}) {
           return replacedCode;
         }
 
-        replacedCode = replacedCode.replace(/__HMR_BASE__/g, `"${blockletPrefix}"+__HMR_BASE__`);
+        if (['client', 'middleware'].includes(hmrMode)) {
+          replacedCode = replacedCode.replace(/__HMR_BASE__/g, `"${blockletPrefix}"+__HMR_BASE__`);
+        }
 
-        if (process.env.VITE_HMR_MODE === 'middleware') {
+        if (hmrMode === 'middleware') {
           // 根据页面的协议自动判断端口
           replacedCode = replacedCode.replace(
             /__HMR_PORT__/g,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-blocklet",
   "type": "module",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "",
   "main": "index.js",
   "files": [