vite-plugin-blocklet 0.14.0 → 0.14.2

package/dist/index.cjs

@@ -1,11 +1,12 @@
 'use strict';
 
 var vitePluginNodePolyfills = require('vite-plugin-node-polyfills');
+var defu = require('defu');
 var vite = require('vite');
 var semver = require('semver');
 var node_fs = require('node:fs');
 var YAML = require('yaml');
-var Mcrypto = require('@ocap/mcrypto');
+var mcrypto = require('@ocap/mcrypto');
 var util = require('@ocap/util');
 var did = require('@arcblock/did');
 var fs = require('fs');
@@ -20,15 +21,13 @@ var getPort = require('get-port');
 var mri = require('mri');
 var httpProxyMiddleware = require('http-proxy-middleware');
 
-const { types } = Mcrypto;
-
 function toBlockletDid(name) {
   if (did.isValid(name)) {
     return name;
   }
 
   const pk = util.toHex(Buffer.from(typeof name === 'string' ? name.trim() : name));
-  return did.fromPublicKey(pk, { role: types.RoleType.ROLE_ANY });
+  return did.fromPublicKey(pk, { role: mcrypto.types.RoleType.ROLE_ANY });
 }
 
 async function getBlockletYAML() {
@@ -1004,6 +1003,14 @@ async function setupClient(app, options = {}) {
  * @property {number} [chunkSizeLimit=2000] - The chunk size limit in KB.
  */
 
+const defuReplaceArray = defu.createDefu((obj, key, value) => {
+  // 如果当前值或默认值是数组，直接使用新值（实现替换）
+  if (Array.isArray(obj[key]) || Array.isArray(value)) {
+    obj[key] = value;
+    return true // 返回 true 表示我们已经处理了这个 key，defu 不需要再做默认处理
+  }
+});
+
 /**
  * Create blocklet plugins.
  *
@@ -1039,7 +1046,15 @@ function createBlockletPlugin(options = {}) {
     plugins.push(createHmrPlugin(restOptions));
   }
   if (!disableNodePolyfills) {
-    plugins.push(vitePluginNodePolyfills.nodePolyfills(nodePolyfillsOptions));
+    const mergedOptions = defuReplaceArray(nodePolyfillsOptions, {
+      include: ['buffer'],
+      globals: {
+        buffer: true,
+        global: false,
+        process: false,
+      }
+    });
+    plugins.push(vitePluginNodePolyfills.nodePolyfills(mergedOptions));
   }
   if (!disableLoading) {
     plugins.push(createLoadingPlugin(restOptions));

package/index.js

@@ -1,4 +1,6 @@
 import { nodePolyfills } from 'vite-plugin-node-polyfills';
+import { createDefu } from 'defu';
+
 import createHmrPlugin from './libs/hmr.js';
 import createConfigPlugin from './libs/config.js';
 import createMetaPlugin from './libs/meta.js';
@@ -44,6 +46,14 @@ import setupClient from './libs/client.js';
  * @property {number} [chunkSizeLimit=2000] - The chunk size limit in KB.
  */
 
+const defuReplaceArray = createDefu((obj, key, value) => {
+  // 如果当前值或默认值是数组，直接使用新值（实现替换）
+  if (Array.isArray(obj[key]) || Array.isArray(value)) {
+    obj[key] = value
+    return true // 返回 true 表示我们已经处理了这个 key，defu 不需要再做默认处理
+  }
+})
+
 /**
  * Create blocklet plugins.
  *
@@ -79,7 +89,15 @@ export function createBlockletPlugin(options = {}) {
     plugins.push(createHmrPlugin(restOptions));
   }
   if (!disableNodePolyfills) {
-    plugins.push(nodePolyfills(nodePolyfillsOptions));
+    const mergedOptions = defuReplaceArray(nodePolyfillsOptions, {
+      include: ['buffer'],
+      globals: {
+        buffer: true,
+        global: false,
+        process: false,
+      }
+    });
+    plugins.push(nodePolyfills(mergedOptions));
   }
   if (!disableLoading) {
     plugins.push(createLoadingPlugin(restOptions));

package/libs/utils.js

@@ -1,11 +1,9 @@
 import { promises as fs } from 'node:fs';
 import YAML from 'yaml';
-import Mcrypto from '@ocap/mcrypto';
+import { types } from '@ocap/mcrypto';
 import { toHex } from '@ocap/util';
 import { fromPublicKey, isValid } from '@arcblock/did';
 
-const { types } = Mcrypto;
-
 export function toBlockletDid(name) {
   if (isValid(name)) {
     return name;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-blocklet",
   "type": "module",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "description": "",
   "main": "index.js",
   "files": [
@@ -30,9 +30,10 @@
     "rollup": "^4.34.8"
   },
   "dependencies": {
-    "@arcblock/did": "^1.27.15",
-    "@ocap/mcrypto": "^1.27.15",
-    "@ocap/util": "^1.27.15",
+    "@arcblock/did": "^1.28.0",
+    "@ocap/mcrypto": "^1.28.0",
+    "@ocap/util": "^1.28.0",
+    "defu": "^6.1.4",
     "get-port": "^5.1.1",
     "http-proxy-middleware": "^3.0.3",
     "ismobilejs": "^1.1.1",