vite-plugin-blocklet 0.5.1 → 0.5.3

package/dist/index.cjs

@@ -11,7 +11,6 @@ var fs = require('fs');
 var path = require('path');
 var YAML = require('yaml');
 var getPort = require('get-port');
-var httpProxyMiddleware = require('http-proxy-middleware');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -46,10 +45,6 @@ function createHmrPlugin({ version = vite.version } = {}) {
             "const base = __BASE__ || '/';\nlet tmpPort = __HMR_PORT__;\nif (window.blocklet) {\ntmpPort = new URL(window.location.href).port + base;\n}\nconst socketHost = `${__HMR_HOSTNAME__ || location.hostname}${tmpPort ? `:${tmpPort}` : ''}`;"
           );
           return replacedCode;
-        } else if (pureVersion === 3) {
-          let replacedCode = code;
-          replacedCode = replacedCode.replace('__HMR_PORT__', 'undefined');
-          return replacedCode;
         }
       }
     },
@@ -157,25 +152,22 @@ function createMetaPlugin() {
 
 const isProduction = process.env.NODE_ENV === 'production' || process.env.ABT_NODE_SERVICE_ENV === 'production';
 
-async function setupClient(app, server, options = {}) {
+async function setupClient(app, options = {}) {
   if (!isProduction) {
-    const randomport = await getPort__default["default"]();
-    const { host = 'localhost', protocol = 'ws', port = randomport } = options;
-    const hmrPath = `/_vite_websocket_${port}`;
+    const { host = '127.0.0.1', protocol = 'ws', port: inputPort } = options;
+    const port = await getPort__default["default"]({ port: inputPort });
     // 以中间件模式创建 Vite 服务器
     const vite$1 = await vite.createServer({
       server: {
         middlewareMode: true,
         hmr: {
+          host,
           port,
-          path: hmrPath,
+          protocol,
         },
       },
     });
     // 将 vite 的 connect 实例作中间件使用
-    const wsProxy = httpProxyMiddleware.createProxyMiddleware(`${protocol}://${host}:${port}`);
-    app.use(hmrPath, wsProxy);
-    server.on('upgrade', wsProxy.upgrade);
     app.use(vite$1.middlewares);
   }
 }

package/libs/client.js

@@ -1,28 +1,24 @@
 import getPort from 'get-port';
 import { createServer } from 'vite';
-import { createProxyMiddleware } from 'http-proxy-middleware';
 
 const isProduction = process.env.NODE_ENV === 'production' || process.env.ABT_NODE_SERVICE_ENV === 'production';
 
-export default async function setupClient(app, server, options = {}) {
+export default async function setupClient(app, options = {}) {
   if (!isProduction) {
-    const randomport = await getPort();
-    const { host = 'localhost', protocol = 'ws', port = randomport } = options;
-    const hmrPath = `/_vite_websocket_${port}`;
+    const { host = '127.0.0.1', protocol = 'ws', port: inputPort } = options;
+    const port = await getPort({ port: inputPort });
     // 以中间件模式创建 Vite 服务器
     const vite = await createServer({
       server: {
         middlewareMode: true,
         hmr: {
+          host,
           port,
-          path: hmrPath,
+          protocol,
         },
       },
     });
     // 将 vite 的 connect 实例作中间件使用
-    const wsProxy = createProxyMiddleware(`${protocol}://${host}:${port}`);
-    app.use(hmrPath, wsProxy);
-    server.on('upgrade', wsProxy.upgrade);
     app.use(vite.middlewares);
   }
 }

package/libs/hmr.js

@@ -17,10 +17,6 @@ export default function createHmrPlugin({ version = viteVersion } = {}) {
             "const base = __BASE__ || '/';\nlet tmpPort = __HMR_PORT__;\nif (window.blocklet) {\ntmpPort = new URL(window.location.href).port + base;\n}\nconst socketHost = `${__HMR_HOSTNAME__ || location.hostname}${tmpPort ? `:${tmpPort}` : ''}`;"
           );
           return replacedCode;
-        } else if (pureVersion === 3) {
-          let replacedCode = code;
-          replacedCode = replacedCode.replace('__HMR_PORT__', 'undefined');
-          return replacedCode;
         }
       }
     },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-blocklet",
   "type": "module",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "",
   "main": "index.js",
   "files": [
@@ -27,11 +27,10 @@
     "rollup": "^2.79.1"
   },
   "dependencies": {
-    "@arcblock/did": "^1.18.6",
-    "@ocap/mcrypto": "^1.18.6",
-    "@ocap/util": "^1.18.6",
+    "@arcblock/did": "^1.18.13",
+    "@ocap/mcrypto": "^1.18.13",
+    "@ocap/util": "^1.18.13",
     "get-port": "^5.1.1",
-    "http-proxy-middleware": "^2.0.6",
     "semver": "^7.3.8",
     "yaml": "^2.1.3"
   },